From 728d21b29b48f6c45a8e3677e62bd4655d8f737b Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Fri, 19 May 2017 12:55:26 +0100 Subject: [PATCH] build: more adjustments to top-level Makefile dependencies In the original code, top-level dist target unconditionally invokes dist target for tools/include, which is wrong when tools component is not enabled. Make dist-tools depend on dist-tools-public-headers, which depends on build-tools-public-headers. Discovered by Travis-CI. Signed-off-by: Wei Liu Acked-by: Ian Jackson elease-acked-by: Julien Grall --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e958bdc44b..fc30b3cc29 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,10 @@ export DESTDIR build-tools-public-headers: $(MAKE) -C tools/include +.PHONY: dist-tools-public-headers +dist-tools-public-headers: build-tools-public-headers + $(MAKE) -C tools/include dist + # build and install everything into the standard system directories .PHONY: install install: $(TARGS_INSTALL) @@ -80,13 +84,15 @@ test: .PHONY: dist dist: DESTDIR=$(DISTDIR)/install dist: $(TARGS_DIST) dist-misc - make -C tools/include dist dist-misc: $(INSTALL_DIR) $(DISTDIR)/ $(INSTALL_DATA) ./COPYING $(DISTDIR) $(INSTALL_DATA) ./README $(DISTDIR) $(INSTALL_PROG) ./install.sh $(DISTDIR) + + +dist-tools: dist-tools-public-headers dist-%: DESTDIR=$(DISTDIR)/install dist-%: install-% @: # do nothing -- 2.30.2